Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake: Adjust the download directory and name of external dependencies #4511

Merged
merged 2 commits into from
Nov 12, 2021
Merged

CMake: Adjust the download directory and name of external dependencies #4511

merged 2 commits into from
Nov 12, 2021

Conversation

uklotzde
Copy link
Contributor

The file name in the URL doesn't match the actual file name that is downloaded from GitHub.

Reduces the friction for external downloads and allows to simplify the packaging.

@uklotzde uklotzde added the build label Nov 10, 2021
@uklotzde uklotzde changed the title Adjust the download directory and name of external dependencies CMake: Adjust the download directory and name of external dependencies Nov 10, 2021
@uklotzde
Copy link
Contributor Author

@Holzhaus I have no idea what's wrong with the changelog. Ideally, the ### Packaging changes should be skipped when generating the metainfo.

@uklotzde
Copy link
Contributor Author

uklotzde commented Nov 10, 2021

Manual line breaks in CHANGELOG.md don't seem to work. Fixed. Still failing

@Holzhaus
Copy link
Member

It's failing because the metainfo.xml changes are missing.

The file name in the URL doesn't match the actual file name that
is downloaded from GitHub.
@uklotzde
Copy link
Contributor Author

It's failing because the metainfo.xml changes are missing.

Thanks. Forgot to re-enable my pre-commit hooks.

@uklotzde
Copy link
Contributor Author

I remember that pre-commit failed with strange error messages after upgrading from Fedora 34 to 35. Happened for this and other projects. Had to re-install it which removed the hooks.

@Swiftb0y
Copy link
Member

Same for me. The hooks hardcoded python3.9 for some reason and fedora 35 ships python3.10. I also fixed it by reinstalling the pre-commit hooks.

CMakeLists.txt Outdated
@@ -1808,7 +1808,8 @@ target_include_directories(mixxx-lib SYSTEM PUBLIC lib/fidlib)
target_link_libraries(mixxx-lib PRIVATE fidlib)

# KeyFinder
find_package(KeyFinder)
set(LIBKEYFINDER_VERSION 2.2.4)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
set(LIBKEYFINDER_VERSION 2.2.4)
set(LIBKEYFINDER_VERSION 2.2.5)

CHANGELOG.md Outdated
### Packaging

* Downloads of external dependencies are placed in build/downloads
* The sources for libkeyfinder are now expected in build/downloads/libkeyfinder-2.2.4.zip instead of build/download/libkeyfinder/v2.2.4.zip
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* The sources for libkeyfinder are now expected in build/downloads/libkeyfinder-2.2.4.zip instead of build/download/libkeyfinder/v2.2.4.zip
* The sources for libkeyfinder are now expected in build/downloads/libkeyfinder-2.2.5.zip instead of build/download/libkeyfinder/v2.2.5.zip

@Be-ing
Copy link
Contributor

Be-ing commented Nov 12, 2021

The hash of the download needs to be updated too.

@Be-ing Be-ing merged commit abbfb22 into mixxxdj:2.3 Nov 12, 2021
@uklotzde uklotzde deleted the cmake-external-downloads branch November 22, 2021 01:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants